From 7b7a8ea1487925b2499aad924cb74663068eb838 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Thu, 23 Feb 2006 11:42:19 +0100 Subject: [PATCH] Silenty ignore calls to xen_create_contiguous_region() when running in auto_translated_physmap mode. A new comment in that function explains why this is an okay thing to do. This avoids an unnecessary crash in Xen's skbuff_ctor. Signed-off-by: Michael Vrable Signed-off-by: Keir Fraser --- linux-2.6-xen-sparse/arch/i386/mm/hypervisor.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/linux-2.6-xen-sparse/arch/i386/mm/hypervisor.c b/linux-2.6-xen-sparse/arch/i386/mm/hypervisor.c index 2413c5cc4f..cfc359e491 100644 --- a/linux-2.6-xen-sparse/arch/i386/mm/hypervisor.c +++ b/linux-2.6-xen-sparse/arch/i386/mm/hypervisor.c @@ -324,10 +324,13 @@ int xen_create_contiguous_region( .domid = DOMID_SELF }; - if (xen_feature(XENFEAT_auto_translated_physmap)) { - BUG_ON(order >= 1); + /* + * Currently an auto-translated guest will not perform I/O, nor will + * it require PAE page directories below 4GB. Therefore any calls to + * this function are redundant and can be ignored. + */ + if (xen_feature(XENFEAT_auto_translated_physmap)) return 0; - } scrub_pages(vstart, 1 << order); -- 2.30.2